feat(mcp): append server instructions to context#32490
Merged
Merged
Conversation
1 task
Arcadi4
force-pushed
the
feat/mcp-instructions
branch
from
3383e87 to
7177d27
Compare
# Conflicts: # packages/opencode/test/session/prompt.test.ts
# Conflicts: # packages/opencode/src/mcp/index.ts
BenGu3
pushed a commit
to BenGu3/opencode
that referenced
this pull request
Jun 27, 2026
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
josechifflet
pushed a commit
to josechifflet/opencode
that referenced
this pull request
Jun 27, 2026
Co-authored-by: Aiden Cline <aidenpcline@gmail.com> (cherry picked from commit e8e83af)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue for this PR
Refs #28567
Close #30084 #7373
Part of the larger MCP revision.
Type of change
What does this PR do?
Append MCP server
InitializeResult.instructionsto the session system prompt.Each connected server with instructions contributes a block shaped like:
Since tool definitions are separate from the system prompt, this form explicitly links the instruction to the specific set of tools provided by that MCP server.
How did you verify your code works?
Verified locally with focused MCP lifecycle coverage and a prompt-loop request check that observes the instruction block in model context.
Screenshots / recordings
N/A
Checklist